x86: Fix save_all regs macro for new CONFIG_FRAME_POINTER define.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/include/asm-x86/x86_32/asm_defns.h b/xen/include/asm-x86/x86_32/asm_defns.h
index b37f3c5a9b1d34088aed2da94dd10040bb5de110..6aac4cbf1645251ef8087589d10f6ae085b88bbd 100644 (file)
--- a/xen/include/asm-x86/x86_32/asm_defns.h
+++ b/xen/include/asm-x86/x86_32/asm_defns.h
@@ -3,11 +3,16 @@
 
 #include <asm/percpu.h>
 
-#ifndef NDEBUG
+#ifdef CONFIG_FRAME_POINTER
 /* Indicate special exception stack frame by inverting the frame pointer. */
 #define SETUP_EXCEPTION_FRAME_POINTER           \
         movl  %esp,%ebp;                        \
         notl  %ebp
+#else
+#define SETUP_EXCEPTION_FRAME_POINTER
+#endif
+
+#ifndef NDEBUG
 #define ASSERT_INTERRUPT_STATUS(x)              \
         pushf;                                  \
         testb $X86_EFLAGS_IF>>8,1(%esp);        \
@@ -15,7 +20,6 @@
         ud2a;                                   \
 1:      addl  $4,%esp;
 #else
-#define SETUP_EXCEPTION_FRAME_POINTER
 #define ASSERT_INTERRUPT_STATUS(x)
 #endif
 

diff --git a/xen/include/asm-x86/x86_64/asm_defns.h b/xen/include/asm-x86/x86_64/asm_defns.h
index 231f3aa02ec5374b7155830031c39d4d587112c4..e576e0315a9824a2a3a07c30f3ca8857704df749 100644 (file)
--- a/xen/include/asm-x86/x86_64/asm_defns.h
+++ b/xen/include/asm-x86/x86_64/asm_defns.h
@@ -3,11 +3,16 @@
 
 #include <asm/percpu.h>
 
-#ifndef NDEBUG
+#ifdef CONFIG_FRAME_POINTER
 /* Indicate special exception stack frame by inverting the frame pointer. */
 #define SETUP_EXCEPTION_FRAME_POINTER           \
         movq  %rsp,%rbp;                        \
         notq  %rbp
+#else
+#define SETUP_EXCEPTION_FRAME_POINTER
+#endif
+
+#ifndef NDEBUG
 #define ASSERT_INTERRUPT_STATUS(x)              \
         pushf;                                  \
         testb $X86_EFLAGS_IF>>8,1(%rsp);        \
@@ -15,7 +20,6 @@
         ud2a;                                   \
 1:      addq  $8,%rsp;
 #else
-#define SETUP_EXCEPTION_FRAME_POINTER
 #define ASSERT_INTERRUPT_STATUS(x)
 #endif